Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Feb 2011 00:15:26 +0000 (16:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Feb 2011 00:15:26 +0000 (16:15 -0800)
commitbe3bdf5e68ed150dda6745e4d4d71170e52ccf98
tree370399b8a4a711fa1cf66c2bfecdda70f3f5bf8f
parent098ff10977b083c4cce8b2e319ca6d70bb1f3493
parent9759a1720b75aa93874817c36544fb80d179f6e2
Merge from mainline.